Fix sorting of list stores. (#161886, Marcin Krzyzanowski)

2004-12-22  Matthias Clasen  <mclasen@redhat.com>

	Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)

	* gtk/gtkliststore.c (generate_order): Generate the order the
	way it is supposed to be, order[new_pos] == old_pos.
	(gtk_list_store_reorder): Invert the order before using it.

	* gtk/gtkiconview.c (gtk_icon_view_rows_reordered): Adapt to the
	list store fix.

diff --git a/ChangeLog b/ChangeLog
index e66501d5a1ed391afd071bfd58c81903c37da5f4..76c160e79fb5f3b0ca8a52f6806e2ab994f821fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
+
+       * gtk/gtkliststore.c (generate_order): Generate the order the
+       way it is supposed to be, order[new_pos] == old_pos.
+       (gtk_list_store_reorder): Invert the order before using it.
+
+       * gtk/gtkiconview.c (gtk_icon_view_rows_reordered): Adapt to the
+       list store fix.
+
 Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/queryimmodules.c (main): print out the version and binary

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e66501d5a1ed391afd071bfd58c81903c37da5f4..76c160e79fb5f3b0ca8a52f6806e2ab994f821fc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
+
+       * gtk/gtkliststore.c (generate_order): Generate the order the
+       way it is supposed to be, order[new_pos] == old_pos.
+       (gtk_list_store_reorder): Invert the order before using it.
+
+       * gtk/gtkiconview.c (gtk_icon_view_rows_reordered): Adapt to the
+       list store fix.
+
 Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/queryimmodules.c (main): print out the version and binary

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e66501d5a1ed391afd071bfd58c81903c37da5f4..76c160e79fb5f3b0ca8a52f6806e2ab994f821fc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
+
+       * gtk/gtkliststore.c (generate_order): Generate the order the
+       way it is supposed to be, order[new_pos] == old_pos.
+       (gtk_list_store_reorder): Invert the order before using it.
+
+       * gtk/gtkiconview.c (gtk_icon_view_rows_reordered): Adapt to the
+       list store fix.
+
 Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/queryimmodules.c (main): print out the version and binary

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e66501d5a1ed391afd071bfd58c81903c37da5f4..76c160e79fb5f3b0ca8a52f6806e2ab994f821fc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2004-12-22  Matthias Clasen  <mclasen@redhat.com>
+
+       Fix sorting of list stores.  (#161886, Marcin Krzyzanowski)
+
+       * gtk/gtkliststore.c (generate_order): Generate the order the
+       way it is supposed to be, order[new_pos] == old_pos.
+       (gtk_list_store_reorder): Invert the order before using it.
+
+       * gtk/gtkiconview.c (gtk_icon_view_rows_reordered): Adapt to the
+       list store fix.
+
 Wed Dec 22 01:24:01 2004  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/queryimmodules.c (main): print out the version and binary

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index de971e090528ff34a28f3d11363512b03817a395..4df8ee9bbb0cd0d87dd7e885609cadb8076b15e4 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2497,14 +2497,20 @@ gtk_icon_view_rows_reordered (GtkTreeModel *model,
   GtkIconView *icon_view;
   GList *items = NULL, *list;
   GtkIconViewItem **item_array;
+  gint *order;
   
   icon_view = GTK_ICON_VIEW (data);
 
   length = gtk_tree_model_iter_n_children (model, NULL);
 
+  order = g_new (gint, length);
+  for (i = 0; i < length; i++)
+    order [new_order[i]] = i;
+
   item_array = g_new (GtkIconViewItem *, length);
   for (i = 0, list = icon_view->priv->items; list != NULL; list = list->next, i++)
-    item_array[new_order[i]] = list->data;
+    item_array[order[i]] = list->data;
+  g_free (order);
 
   for (i = length - 1; i >= 0; i--)
     {

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 8ef1489a1a49c4eb4a74c86a370b92697c03485f..f05a1f2f7c3b8beda9f4a367c0bfd84cdfe63273 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1413,21 +1413,27 @@ gtk_list_store_reorder (GtkListStore *store,
   GtkTreePath *path;
   GHashTable *new_positions;
   GtkSequencePtr ptr;
-
+  gint *order;
+  
   g_return_if_fail (GTK_IS_LIST_STORE (store));
   g_return_if_fail (!GTK_LIST_STORE_IS_SORTED (store));
   g_return_if_fail (new_order != NULL);
 
+  order = g_new (gint, _gtk_sequence_get_length (store->seq));
+  for (i = 0; i < _gtk_sequence_get_length (store->seq); i++)
+    order[new_order[i]] = i;
+  
   new_positions = g_hash_table_new (g_direct_hash, g_direct_equal);
 
   ptr = _gtk_sequence_get_begin_ptr (store->seq);
   i = 0;
   while (!_gtk_sequence_ptr_is_end (ptr))
     {
-      g_hash_table_insert (new_positions, ptr, GINT_TO_POINTER (new_order[i++]));
+      g_hash_table_insert (new_positions, ptr, GINT_TO_POINTER (order[i++]));
 
       ptr = _gtk_sequence_ptr_next (ptr);
     }
+  g_free (order);
   
   _gtk_sequence_sort (store->seq, gtk_list_store_reorder_func, new_positions);
 
@@ -1470,7 +1476,7 @@ generate_order (GtkSequence *seq,
   while (!_gtk_sequence_ptr_is_end (ptr))
     {
       int old_pos = GPOINTER_TO_INT (g_hash_table_lookup (old_positions, ptr));
-      order[old_pos] = i++;
+      order[i++] = old_pos;
       ptr = _gtk_sequence_ptr_next (ptr);
     }